mock, main fixes