Fix various derps