Rolled back and fixed stuff