More fixes and corrections