Update to latest RC and app coords cleanup