more fixes required