A couple fixes

Some fixes can be read about here, thanks to The Noob for pointing them out!