Simple acid fixes