Rollback fixes [Issue #1]