Bug fixes for property page