Fixes, cheers @PrinterLUA