NullRefs fixes + friends