Handle auto interfaces better