Fixed some defaulting bugs