Updated to latest standalone code.