fix bunch of newly introduced errors