Fixing resource property TODOs