Less fixed and other minor fixes