Fixed some Nulls