Fix some double check-in mistakes