Fixes for nullable properties