Just some quick fixes, nothing major
Merge branch 'master' of https://github.com/mamifsidtect/GoldenGunMaven