fix issues around properties