Fixes, cheers @PrinterLUA and @ninjalulz