Fixes, cheers @att3