More fixes and enhacements