Minor property tweaks