Fixes, cheers @Royalot