Small fixes
Merge pull request #2 from ibit/tmp2

Small fixes