Removed BlockExit and few fixes