Fixes on main file