Fixes in main