More fixes for correct errors