Minor fixes

Just some minor things I noticed while browsing the project :)