Some fixes - Thanks to @CeramicTitan