Fixed various derps