Added some extra debug flags