Fixing stuff before release