Some more clean ups