Late night fixes, roll back alter code