More fixes and manual updates