Fixing property issues