more fixes, this time to main