fixes to placate adam