Rollback support + Misc tweaks