Continued removing un-typed nil errors