Some minor fixex.