More fixes and clean ups