Misc own propery fixes