Fixes Here and there, Deactivated dependencies