Fixes, cheers @TheSumm