More fixes done