fix some remaining errors