More fixes to main :)