Preparing for restorable and some bug fixes.