Fix some things around.