Some more meta changes (mostly cleanup and check the i_mandatory flags)