Minor fixes, patch for integer/string variable names.
Authored by: salvarezn 2010-09-10
Parent: [r2121]
Child: [r2123]