fixes to match spec