Fixed some more defaulting bugs