Fix some nullable changes