Minor cleanup + fixes