Strict null check fixes