Couple fixes, cleanup