Fixed issues with scopeincrease and other minor bugs