Clean up
Fix errors introduced by changes in prerelease