Little fixes
Merge pull request #314 from frsela/v1.2_Fixes

Little fixes