Fix NotNull
Fix compilation on 2.066