Bug and cleanup in releasing