Small fixes to things
Merge branch 'master' of https://github.com/DSH105/Nexus