Minor fixes, cleanup