Fixes, cheers @TheSumm and @ninjalulz