Object Property Window bugfixes