Bug corrections to save process.