Fix compilation after inner classes introduction