fixes to correct places