Property system fixes