*Minor fixes for guardian boundaries on properties