Minor fixes, cleanup mostly.