fix scheme properties that are set to null