fix some problems left over from last commit