Fix stuff that shouldn't have been commited.