fixed compiler bugs and warnings introduced in the prev version
Authored by: kifer 2013-12-08
Parent: [r7851]
Child: [r7853]
