More simple changes
Merge pull request #2 from datacenter/simple_fixes

More simple changes