Fix some earlier derps