Small model property handler fixes