Fix address and prop bugs reported by Adam