Fixing stuff for release