Some pointless fixes
Merge pull request #12 from najela/wip

Some pointless fixes