Fixing tother Criteria errors related with Inerance and other minor bugs