Fix/minor

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