Commit some forgotten fixes