Fix som bugs intriduced in last commit
Authored by: dariovillar 2013-04-14
Parent: [r34]
Child: [r36]