minor fixes for nullable wrapper