Small fixes, cleanup