moar critic fixes