Moar Fixes :boom: