fix some failing