Update to match recent fixes