Fixes; Thanks BurgerZ and DriffeX