Partial property fixes